Merge changes from topic "wifi-constants" into tm-qpr-dev am: 5bba501a am: 98634c47

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



Change-Id: I997edae1de45a3c35ec2531c792cc3eac2b4fe71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>