[automerger skipped] Merge "Add flag for share wifi button." into udc-qpr-dev...

[automerger skipped] Merge "Add flag for share wifi button." into udc-qpr-dev am: 85125d90 am: 8f6ffcbe -s ours

am skip reason: Merged-In Ia63161f3658cbd6b5c9cca0a3848141d3add6658 with SHA-1 81184020 is already in history

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



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