Merge changes from topic "presubmit-am-de142fbe8e194ef6aa11bc14dc2f1210" into tm-mainline-prod am: acde16aa

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



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