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

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

Change-Id: Ib1b74e05d7e9bc209cf4eb2d62071e1ff6196066