[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in...
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am: 9bdc35b2
am: e5b407a2 -s ours
am skip reason: subject contains skip directive
Change-Id: If7fa68f065e97db5f38537c8ffe10b7344e5b846