Merge "Fix typo in AngleOfArrivalSupportType values" am: f178b46b87 am: 27ba646baf

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

Change-Id: Icf283c05af84b7251285d5034774c74577b76a49