Merge "Reorder/cleanup FCM exempt list #1" am: ef85febe6a am: 7380d36ae3 am: 7a07e92303 am: 5ea7bf3c6b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427724

Change-Id: I8cc4b9aee221af981caf2a6f0b0e2be95b04cf23