Merge changes from topic "presubmit-am-47bcb3b2a4e14d349285acfc36c61606" into tm-mainline-prod am: 58314568

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



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