[automerger skipped] Merge changes from topic "am-8db26f97255a47d789da3cac64a835f3" into sc-v2-dev-plus-aosp am: 0844d577ed -s ours
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 3072d98c2d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045726
Change-Id: Ie2c347b610e39abf0c6b3de07e12de6c8d25c5f6
This commit is contained in: