[automerger skipped] Merge "Remove unused import in DisplayContent" into...

[automerger skipped] Merge "Remove unused import in DisplayContent" into sc-v2-dev am: 9bf3ed70 am: e250da82 -s ours

am skip reason: Merged-In Icdc3c8b0ee168eb5e83a1ae96733c4c022fa4aeb with SHA-1 56ab7daa is already in history

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

Change-Id: Ief616fcf07d4d7456e628d8db496d5ecf2663181