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

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

Change-Id: I8c9faa1652e702b597cff87c7b5f22f859611dba