Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into...

Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 05ef8fea -s ours

am skip reason: Merged-In Id5cff8223ad6f0463caf9a81e21e40317ada2d23 with SHA-1 215468a1 is already in history

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



Change-Id: I73ed7b7ebf78786398aaeeb3c650c119382feb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>