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 am: b62c83cd

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

Change-Id: Ie6f3e88f53b957f2b632df907d7768c78659e6ee