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

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

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



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