Merge changes from topic "presubmit-am-699bcbdaa9a54be3a56de1e065ef795a" into...

Merge changes from topic "presubmit-am-699bcbdaa9a54be3a56de1e065ef795a" into tm-mainline-prod am: 3f096a94

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



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