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

[automerger skipped] Add new column enabled_mobile_data_policies to siminfo table am: ed98c848 -s ours am: ef75be39 -s ours am: 51159629 -s ours

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

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



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