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

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

Change-Id: I211496ee4a1e403d4c4ece8f9dbbe2f129422769