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

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



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