[automerger skipped] Merge "Add display committed state to DisplayInfo" into tm-qpr-dev am: bb208e41 am: 1a7efe38 -s ours am: b32ec0e0 -s ours

am skip reason: Merged-In Ia2fbab768b696c59578d974c88157ee3c8f3ddde with SHA-1 07c6ebdd is already in history

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



Change-Id: I774480727c2e71eee7aaca67dd108afffc5fe923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>