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

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

Change-Id: I2d4ba70aa6f536681fd63aee62215f17b6fa937e