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

Change-Id: I9c19d1002e9f9feb1d88e54bcd630fd92e72cf68