[automerger skipped] support data migration from OEM legacy app to mainline am: 32f525c975 am: 383e36c9aa am: 7d30df799e -s ours
am skip reason: Change-Id I6e583672a3673fd226e14d33d7a7648f4fd03efb with SHA-1 ad2f91fc6d is in history

Change-Id: Ieff020fd580cf19b1027cd28bf6580a90ff40e24