Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-mainline-prod am: e07e667d

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



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