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

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

Change-Id: I434384e3f8ef5fd5b26e97ec7dda34ed5f7ab34c