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

Change-Id: Iab42884e808ecbeb7aaa7016ef3a91aacb85b806