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

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

Change-Id: I1021bafc18347859022ab5ce40e2683b514e459e