Merge "Expose system API EXTRA_REBROADCAST_ON_UNLOCK" am: 027bf28b3a am: 071427f6f6 am: 420b9476dc

Change-Id: Ibcd4b099f99b77a324d6550b2373c38fd2d6c8db