[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am: 9bdc35b2df -s ours
am: 1ea0bce72a
Change-Id: Ica00080cedab5e38e3930b5a3b347dc636fe020a
This commit is contained in: