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

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

Change-Id: Ife813e23e063b6e75e012c85d0b9f108cb54ace9