[automerger skipped] Add new column enabled_mobile_data_policies to siminfo...

[automerger skipped] Add new column enabled_mobile_data_policies to siminfo table am: eee09129 -s ours am: 3e7f5477 -s ours

am skip reason: Merged-In I460c24909fb1eae689d02cedc76e24e87674a891 with SHA-1 3238bb60 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378850



Change-Id: If7e2055be72cf680c1f8506f011a30b5c5000d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>