[automerger skipped] Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 am: d81c20011a am: c847b5cc35 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e11c925da1cb7a94c812f68b60c77350c26770
tree: f5bc65c587d962870ee0ac7e78de7b3ce82eab8d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS