Merge changes from topic "platform_shared" am: c183b7c684

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8fc4afaa04a615687f807b8ab300960ccb2e9fb