Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197 am: 0d1f0438 am: d9bfb83d Change-Id: I6dd418684b1a40292cd496ead3613cf938577c09