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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ccaf4357cc28cfcf28c246b9f76aea3708347bf