Merge changes from topic "am-5a8427cd0d69431bbf06323340258192" into tm-dev am:...

Merge changes from topic "am-5a8427cd0d69431bbf06323340258192" into tm-dev am: e0363130 am: 0065a302 am: 2b13f901 am: 1b7503da

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



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