Merge "Unhide APIs of Android HDMI Framework for Q."