Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 am: d81c20011a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad6f9e6cabc5f7eccd0aad020b398950f0495703