Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into...

Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 3144b503 -s ours

am skip reason: Merged-In Ia3eae81cc26b28b0d25dc5f5c6cd04ec8c1bafdf with SHA-1 df2fb613 is already in history

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



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