am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev

* commit 'c4d7fc10211e9f08317c94e64ac57447e04af428':
  Changes callback to a WeakReference in ActivityContainerCallback.