Merge changes from topic "presubmit-am-975126cf03be4f49b83d52ef5710ad8d" into...

Merge changes from topic "presubmit-am-975126cf03be4f49b83d52ef5710ad8d" into tm-dev am: 694a135e am: eedbc186

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



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