Merge "Add "Unlocked device required" key API" into pi-dev
am: d83bad7d89

Change-Id: I253aeb161f4963b4ab7ec3da53106e43efd5f2bc