[automerger skipped] Merge "[ConfigStore] Clarify hasHDRDisplay spec." am: cd86e194de am: 30de0d87aa
am: a5df87065b  -s ours

Change-Id: I234fe97beaf208754e59c8b6865a2ca638a8c389