Merge changes from topic "presubmit-am-1f82416e0ad1476b96c0b2970ccf1a1a" into...

Merge changes from topic "presubmit-am-1f82416e0ad1476b96c0b2970ccf1a1a" into tm-dev am: c2b48fa0 am: 01e2155b

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



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