[automerger skipped] Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f am: e3d28b9a am: c9dddc84 -s ours

am skip reason: skip tag Change-Id Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa with SHA-1 ae04f625 is already in history

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

Change-Id: Ib7ed1d9c595b30fadf6efee2ab2614197e156ce1