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

Change-Id: Id8c5c432441d35beffc0acf555223fba5bb187b6