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

am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 369571a4 is already in history

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



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