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

[automerger skipped] Add new column enabled_mobile_data_policies to siminfo table am: 3238bb60 -s ours am: fad9b93f -s ours am: 61804812 -s ours am: d8e1374b -s ours

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

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



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