Merge changes from topic "platform_shared" am: c183b7c684 am: dca00e9117

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2603bb2e0958aa2c2ed3609f80e537b3ff752d66