Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 18a60acfdf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad8f2d923e9415460c02002750a3766978272a6