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

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

Change-Id: I355401062f9428ae57e287994d660965d66eb830