[automerger skipped] Merge "Implement...

[automerger skipped] Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 18a60acf am: 9bd19b31 am: 5e62891a -s ours

am skip reason: Change-Id I6f03398c1735b89470ad5bdbe3a036929daeb53c with SHA-1 694c8a99 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e11c925da1cb7a94c812f68b60c77350c26770