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

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

Change-Id: I399288e8690159a334d57e4d58cd752ab8fed1f0