[automerger skipped] Merge "Merge "Improved user callbacks on SystemService:"...

[automerger skipped] Merge "Merge "Improved user callbacks on SystemService:" into rvc-dev am: 9fa3a870 am: ae74c70a" into rvc-d1-dev-plus-aosp am: 02f1087d -s ours am: 7b436eb9 -s ours
am skip reason: Change-Id I8774c57620030b9aa8e7ec039a6a758ad56db368 with SHA-1 339b7149 is in history

Change-Id: I77e4598f0cfbdc8c4e703ae3c9ed75fba708596b