Merge "[IncrementalService] fix native lib check after OTA" into rvc-dev am: 9093346b9e am: 6618aa74a7 am: 907c64796b am: 819d6f29ec

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

Change-Id: Ia54c5e2a8d5d0e43e505657437ec223e64e0a42e