[automerger skipped] Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am:...

[automerger skipped] Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7 am: 7f065963 am: ceebf83d -s ours am: 2e139344 -s ours

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

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

Change-Id: I62c4fa0a5f7073fb6eb76ccc9cb08277616d06b0