Merge changes from topic "presubmit-am-915de06fcef24c52a4175203ce6600eb" into...

Merge changes from topic "presubmit-am-915de06fcef24c52a4175203ce6600eb" into tm-dev am: acfbddc8 am: e8aed1a5

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



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