Merge changes from topic "cf-vapex" am: 9425bcc597 am: 63174f7804

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1811056

Change-Id: I88ac941ee5bb1c8a66b515db956c5e28dceda785