Merge changes from topic "staged-apex" am: cfd0460335 am: 2be3823896

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

Change-Id: If42863f3126db859b10758ba4c5816ddb9499786