[automerger skipped] Merge "Improved user callbacks on SystemService:" into rvc-dev am: 9fa3a870c6 am: 9d0a4b8e8b -s ours am: a25a026449 -s ours am: c55ee80b00 -s ours
am skip reason: Change-Id I8774c57620030b9aa8e7ec039a6a758ad56db368 with SHA-1 339b7149af is in history
Change-Id: I70eb61b1751e383e2bf8adcefb7b19549fa8491a
This commit is contained in: