Merge changes from topic "presubmit-am-bceb8e4e168541e88503e0f69150fe98" into tm-dev am: bf850d65

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



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