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

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

Change-Id: If8c9e5560f43a511567b60046165ca7fbb19f8af