[automerger skipped] Merge changes...

[automerger skipped] Merge changes I907533c3,I8502eb90,I60c82e0f,Id4070113,I31c6d0fa am: e0bd94e3 -s ours am: 98a01b7f -s ours am: 7eabaf09 -s ours am: ed87582c -s ours am: ad52298a -s ours

am skip reason: Change-Id I907533c36dcb6c0ef679b0098d497d88476d8b95 with SHA-1 bace9a17 is in history

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

Change-Id: I100fe5e44aa287dd47b3a93848e8170f938798c0