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

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



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