Merge changes from topic "presubmit-am-05344ff48efd40fb998cae56f5a842b0-sc-dev" into sc-qpr1-dev am: 06bbfe7df1 am: b3d819646a am: b6b9ce4be9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697196 Change-Id: I83de23378852245b4ce2f32188af0775ad5e43f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: