Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" into...

Merge changes from topic "presubmit-am-5b208f5d997e40cd88391981653ea568" into tm-mainline-prod am: 49945516

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



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