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

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

Change-Id: I5837b771a171b82426e21505c9440b03f6525c79