Merge "Expose system API EXTRA_REBROADCAST_ON_UNLOCK"
am: 027bf28b3a

Change-Id: I77b80ddd80d2c797d7a492fd361b0d4153c1383a