Merge "Fix 2336057: Provide a way for the user to return to a call from LockScreen."
tree: 1c2b4ac617e741376288bc5f37db3b296de330de
  1. policy/