Merge "Update mobile data preference getter/setter" am: 5a986ca4 am:...

Merge "Update mobile data preference getter/setter" am: 5a986ca4 am: 04d9298d am: b137dcbd am: 1e29090f

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

Change-Id: I3b9bf193a9612e86384fe6d0398e482f9461a9a2