Merge changes from topic "presubmit-am-41e144351270485b94f495fc32653e46" into tm-mainline-prod am: b193890c

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



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