[automerger skipped] Merge changes I752c39bd,I00f49555 am: 98d3db878a am: 27a167ce17 -s ours

am skip reason: Merged-In I752c39bd1bf953a11bdf62e6f02f99f48fef23c4 with SHA-1 64e5f3e6f7 is already in history

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

Change-Id: I81c82854635a2d1fb75f9514d2b5a3203bc6c2c5