[automerger skipped] Merge "Add new column enabled_mobile_data_policies to...

[automerger skipped] Merge "Add new column enabled_mobile_data_policies to siminfo table" am: a8e97b09 -s ours am: 973e5e59 -s ours am: b83c08b1 -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: I2a2fac91add71ae4ad531671fd161a113fa2cd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>