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

Merge changes from topic "am-ccae4e67f611463c9301c2eabbc8a927" into tm-d1-dev-plus-aosp am: f18176bf

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



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