Merge "Update mobile data preference getter/setter" am: 5a986ca45d am: 04d9298d48 am: b137dcbdb3

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

Change-Id: Ib55aaba8c8afc8a3152d83932bf345277bda35f9