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

Change-Id: Iec753dfc9cebc31463c427d5ad2bae47205ed11e