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

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

Change-Id: I16503d42817bece870ed4db438ae5d1b5f398e32