Merge changes from topic "am-5ab8b98d744945ad9ca21a34f2809719" into...

Merge changes from topic "am-5ab8b98d744945ad9ca21a34f2809719" into tm-d1-dev-plus-aosp am: cb874660 am: ff51a13f

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



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