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

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

Change-Id: Ie0734a51820812247ff9f779b97645f772d06573