Merge changes from topic "cf-vapex" am: 9425bcc597 am: 63174f7804 am: 294aa51a1a am: 60f1e5ccba am: db600cd4c6

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

Change-Id: I9a3cea29f9c836e8f86bddfbd1bdd403ffe75926