Merge "Merge "[IncrementalService] fix native lib check after OTA" into rvc-dev am: 9093346b9e am: 4d7ce77709 am: 129e0af9d6" into rvc-qpr-dev-plus-aosp am: 8ae63c4891

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

Change-Id: I518a300d2ea2b580d2c26016811876b250f496ce