Merge "Fix inline not worked after the service package updated" into rvc-dev am: cf3a8611d0 am: 844ac4ce7b am: 60ca6f50e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727103 Change-Id: I876e7b5220abdbdf8823f9b46e809a042d8b3610
This commit is contained in: