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

Merge changes from topic "presubmit-am-ac759ede893c416ea62c4d5bc087973f" into tm-mainline-prod am: 55fbc141

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



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