[automerger skipped] Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361 am: ceebf83ddb -s ours

am skip reason: skip tag Change-Id I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd with SHA-1 31fb58bd22 is already in history

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

Change-Id: I8b6efdc5ef92dbb8bd312433d6cacb2a01bc7706