[automerger skipped] Supported traffic descriptor based network capability am:...

[automerger skipped] Supported traffic descriptor based network capability am: a0a59e4c am: 663e4472 am: a28f3647 -s ours am: 65cf935f -s ours am: bdc64940 -s ours

am skip reason: Merged-In Ibf47aec9f99cf7437c9e03e10f9db83714aca5de with SHA-1 b17fd69f is already in history

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

Change-Id: If6d5a115f5fd420ce8583a485359d07b86e1e8b6