Merge "IWLAN DataFailCause for unexpected tunnel state" am: 30eb433a am:...

Merge "IWLAN DataFailCause for unexpected tunnel state" am: 30eb433a am: fba59365 am: 48f66d8f

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



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