[automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d38 am: 363fe9d0 am: e30e470f -s ours

am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 d75a22bc is in history

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

Change-Id: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a