Merge "[IncrementalService] fix native lib check after OTA" into rvc-dev am: 9093346b9e

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

Change-Id: I7c7fec04934ff6f4773d71673b7e10f43067787a