Merge "[ConfigStore] Clarify hasHDRDisplay spec."
am: cd86e194de

Change-Id: Id3054cb55c79275ba51dcbd58f2a3b1e30914a3a