[automerger skipped] Merge "use @SystemAPI for android.view.display" am:...
[automerger skipped] Merge "use @SystemAPI for android.view.display" am: 74360475 am: a8221afd am: c6b4567d
am: f4f157cf -s ours
am skip reason: change_id Ic677a6a29f1be0da7b0b80b8ce83a516b84d70cd with SHA1 a368f57b is in history
Change-Id: Id65502e0af7c2b0bcfa48c04b6895ef0e0706f15