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

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

Change-Id: I12f3af4d5115c470b727606c4a071b11657da15c