Merge "Merge "Add android.intent.action.HDMI_PLUGGED" into oreo-cts-dev am: 243f10900f" into oreo-mr1-cts-dev am: 8f30511d55
am: 819ae03b8c

Change-Id: Id82d7230fc7db3dc27251c145f6b35b78bbe04be