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

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

Change-Id: Ifb829b05e987614a6309180952c3379c6cf6e7a5