Merge changes from topic "presubmit-am-2a14cb00e8874c219118050b0a76316a" into...

Merge changes from topic "presubmit-am-2a14cb00e8874c219118050b0a76316a" into tm-dev am: 2fbe6354 am: 685c8fe2

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



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