Merge changes from topic "presubmit-am-0fbcb9f62f004d0f8dc1ef0d89cc3db8" into...

Merge changes from topic "presubmit-am-0fbcb9f62f004d0f8dc1ef0d89cc3db8" into sc-v2-dev-plus-aosp am: 790bebc7 am: 4504493c

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



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