Merge "Merge "Increase priority for broadcast intent triggered by HW key" into nyc-mr1-dev am: 72f2597b17 am: fb086b7c49" into nyc-mr1-dev-plus-aosp
am: e3733920a2

Change-Id: Idb8a012cfe5cbf1a96b3dc69068533951eecf249