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