Merge changes from topic "presubmit-am-65f63803c7ea434591f05342f4d5cc98" into...

Merge changes from topic "presubmit-am-65f63803c7ea434591f05342f4d5cc98" into tm-dev am: 40f6441d am: d06c7960

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



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