[automerger skipped] Update CTS shim am: f7919a20 am: b37e4bcc am:...

[automerger skipped] Update CTS shim am: f7919a20 am: b37e4bcc am: f4220951 -s ours am: 03c5aa36 -s ours am: d65fd165 -s ours

am skip reason: Merged-In If280d558b687d3b34d28a2857748fda2dece18dd with SHA-1 749557e9 is already in history

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

Change-Id: Ib2313616279c916939ef08bb93b79857accdb65e