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

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

Change-Id: I876e7b5220abdbdf8823f9b46e809a042d8b3610