Merge changes from topic "am-a020b014c462452180a024d012ebe9a6" into...

Merge changes from topic "am-a020b014c462452180a024d012ebe9a6" into tm-d1-dev-plus-aosp am: e1888a31 am: 617b1aa7

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



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