Merge changes from topic "presubmit-am-d599420170a84c50a10ba549a2b93827" into tm-dev am: 1fe8cad8

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



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