Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0