Merge changes from topic "c2a-apex" am: 2d7bce0b3b am: f9acf16725 am: 350c24d8ed

Original change: https://android-review.googlesource.com/c/platform/development/+/1686814

Change-Id: If96d81f9a7aca46cb2c0412415ef1b0994caff6c