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

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

Change-Id: I90ccba3584b51c01d2cb52af846e42421cf9415e