base

am "am a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed