Merge changes from topic "OMAPI_VNTF" am: f7a480d824 am: 8989606294 am: 746c751732

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

Change-Id: Id763b94253a7ef9f18fc6e81a3886367f5db3d11