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