Merge changes from topic...

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

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



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