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

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

Change-Id: I716ef428d904edc10c63bc8d2dab3ac5377fcf01