Merge "Switch to standard naming scheme" am: b04aea2791

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

Change-Id: Ic1b75b3a6cd0db02d485ecd2ed3939d9faca8200
tree: 9b8487c6ef97f007074fc080120518bc3478f0ce
  1. Tethering/