Merge "Follow sample code package-name convention for InlineFillService. am: e48202f01c am: adb3569164 am: df10bf85d5" into rvc-qpr-dev-plus-aosp