Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059 am:...
Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059 am: 26431282" into nyc-mr1-dev-plus-aosp
am: 9c8953b9
* commit '9c8953b9':
Process user events from service lifecycle callbacks.
Change-Id: I4858fd5659c4b3fb231d50bbb1e93b012c4282c1