[automerger skipped] Merge changes I9881453b,I57fa88c6 am: 07dee30e0c -s ours am: 976ece3dd5 -s ours

am skip reason: Merged-In I9881453ba14cba4f219861ec4449f2baa8058b57 with SHA-1 da737e7149 is already in history

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

Change-Id: I43607f95fdd3277a205eadd1b3952d3a321faa98