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