[automerger skipped] Merge changes from topic "presubmit-am-0704ae76e35641e1b208bbb25fb6f696" into sc-v2-dev-plus-aosp am: cede6de989 -s ours
am skip reason: Merged-In If261163c024fbdf4121fbcd0971ed784018a2991 with SHA-1 70fd00bf2f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16829920
Change-Id: I8b32fb72ea9b34403e22c4f35d96e36651273278
This commit is contained in: