Merge changes from topic "kyatoh-b221483132-tm-dev" into tm-dev am: 37893c20

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



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