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

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

Change-Id: Ib0bb5fae8f972152e4ed0fd0ef411d635c7bf0f1