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

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

Change-Id: If55f72f4b25c60a9db424aa73cea29dce0f3995f