Merge "Properly target the LockHoldingService broadcasts." am: 09cbe61b52 am: c15f9e1802
am: 3911dd5bcc  -s ours

Change-Id: I2ae1f32ad2eed645a2b62faef66f9a2d233b0fbe