Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1 am: 0d1f04384f am: d9bfb83d96
am: 372edc3b7d

Change-Id: I7f09742f4c8e78d41a0bce29fe5d356472819869