Merge "Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev am: f2a70fc116" into oc-mr1-dev-plus-aosp
am: f98abfaf81

Change-Id: Id24288e3810c045babbc7397edf655f59a4642dd