Merge "Merge "Improved user callbacks on SystemService:" into rvc-dev am: 9fa3a870 am: ae74c70a" into rvc-d1-dev-plus-aosp