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

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

Change-Id: Ifc08a25c67b010eff2d1af44a298db32ee718f94