Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: b86ffd63db

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

Change-Id: Ibc8b620025d5d61d34034f29e6f50d48f30b9b34