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

Merge changes from topic "presubmit-am-b1e78f9adaeb496da178ba91df448585" into tm-qpr-dev-plus-aosp am: 7e39707f

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



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