[automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be...

[automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36 am: 4ed0a506 am: 97a9cfb6 -s ours am: 8215d0e1 -s ours

am skip reason: Merged-In Ic18d17d05984fa2466c962c7843c0ef7183ce77c with SHA-1 402b1fd2 is already in history

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

Change-Id: Ic6c1847c331b21f17fecb6a4b3d82691c958d1ea