Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c339 am: 235c3b6316

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

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