Merge changes from topic "presubmit-am-d21852bac5494ecd81a33e411c078e7e" into...

Merge changes from topic "presubmit-am-d21852bac5494ecd81a33e411c078e7e" into tm-mainline-prod am: e4c3543e

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



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