[automerger skipped] Fix transition from Internet Tile to Share Wifi am: d50976b3b1 -s ours

am skip reason: Merged-In I521f550a16798705bd6e82ab95132515793589fa with SHA-1 66beac5bfc is already in history

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

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