[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 -s ours am: 1ea0bce7
am: 64e8f726 -s ours
am skip reason: subject contains skip directive
Change-Id: I44d66d0b01622ca9085796d464f94097474dd41f