Merge "Prevent changes to immutable capabilities for carrier wifi" am: 9e7e3b780d

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

Change-Id: Iac1b1cf962eedc5a6f5e172a508b7bf7402e48b7