Merge "Fix stale NSSL "fling" state caused by no-op fling" into tm-qpr-dev am: 18dfc2fb

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



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