Merge changes from topic "presubmit-am-c81762ef3b084d75afdf183d012bec54" into...

Merge changes from topic "presubmit-am-c81762ef3b084d75afdf183d012bec54" into tm-dev am: 93ccdae2 am: 4c825512

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



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