Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API"
am: 9222283997

Change-Id: I2df7a271747582d519e6fade06e3e8ee599dc764