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

Change-Id: I8c55ab818a9b1f3593b3b027fb426db418c0044e