Merge changes from topic...

Merge changes from topic "presubmit-am-05344ff48efd40fb998cae56f5a842b0-sc-dev" into tm-dev am: d62abb48 am: 3f62d64e

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



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