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

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

Change-Id: I79beb4f903b170b5cd569db55453057773c328ea