Merge changes from topic "presubmit-am-331adb63df8b4710817d78e09926781e" into...

Merge changes from topic "presubmit-am-331adb63df8b4710817d78e09926781e" into tm-mainline-prod am: 609f54b7

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



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