[automerger skipped] SF: Parametrize display lookup am: 0bb9e656 am:...

[automerger skipped] SF: Parametrize display lookup am: 0bb9e656 am: 4f197d5f -s ours am: 231d30c6 -s ours

am skip reason: Merged-In I3d30b282fdf2b80faaedd732f4ff6f032c62ca3d with SHA-1 0bb9e656 is already in history

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

Change-Id: Iea012296ea8509c7363c1c7de93cac07ee4f8bac