Merge changes from topic "presubmit-am-6b013192ee234543a6f14280eb5746c3" into tm-dev am: d2ec5829

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



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