Merge "Make tetherChangePermission to be secured for AppOps permission"
am: fe86a197a1

Change-Id: Iee0af54745c3341b2aeeee05690e0377cb807ad9