[automerger skipped] Merge "Improved user callbacks on SystemService:" into...
[automerger skipped] Merge "Improved user callbacks on SystemService:" into rvc-dev am: 9fa3a870 am: ae74c70a am: 26fe26d1 am: 1d6822df -s ours
am skip reason: Change-Id I8774c57620030b9aa8e7ec039a6a758ad56db368 with SHA-1 58e7458a is in history
Change-Id: I4cf521a63633be1bb1ab98f4227bddfad099f282