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

Merge changes from topic "presubmit-am-2a14cb00e8874c219118050b0a76316a" into tm-dev am: 2fbe6354 am: 699cfb90

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



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