Merge changes from topic "OMAPI_VNTF" am: f7a480d824

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

Change-Id: Ieb8adfa4edf57bfcb3e0037bc523c928b4e9ce48