Merge changes from topic "presubmit-am-7f9c15ce2f1a41e98cec0dbcd8143ed2" into...

Merge changes from topic "presubmit-am-7f9c15ce2f1a41e98cec0dbcd8143ed2" into sc-v2-dev-plus-aosp am: 4e13e7e5 am: 2e83ed96

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



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