[automerger skipped] Merge "TetheringServiceTest: test caller permission" into...
[automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: f7862f53 am: b85bf0e8 -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 aebd8187 is in history
Change-Id: Ie44fa3cc03668bf5c27b12c8e729ecd1fca899d5