Merge "Fix inline not worked after the service package updated" into rvc-dev...

Merge "Fix inline not worked after the service package updated" into rvc-dev am: cf3a8611 am: b338e6b1 am: c05ffbf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727103

Change-Id: I3c71ee3e40d244a09b71d2464803694d4cd8657e