Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into...

Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into sc-qpr1-dev am: e531ea8f am: 1142d566

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



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