[automerger skipped] Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c3 am: 235c3b63...

[automerger skipped] Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c3 am: 235c3b63 am: 228f933f -s ours am: 43d5f076 -s ours am: e7f6e98d -s ours

am skip reason: Merged-In I5bd0351925d27bb2178d4cd0cc93197f463236cd with SHA-1 7319c5f3 is already in history

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



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