Merge "Merge "Deliver new activity options after the activity is made visible"...
Merge "Merge "Deliver new activity options after the activity is made visible" into nyc-dev am: e9f5d365 am: 51335db6" into nyc-mr1-dev-plus-aosp
am: c614d4ed
* commit 'c614d4ed':
Change-Id: I5b5f1f5213f901286b7059b8f60d2257cc1fd888