[automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6 -s ours

am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9a is already in history

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



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