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: 844ac4ce am: a83daedd am: edcaf818

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

Change-Id: I6a40c960e0edb5385ad7af272815b45da451f994