Merge "Deprecated tethering framework resource" into rvc-dev am: 98e874e5...

Merge "Deprecated tethering framework resource" into rvc-dev am: 98e874e5 am: 913559c4 am: d51a3a05 am: cededb2a

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

Change-Id: Id1d9310f2f18b08665133fdfea649164f1d444c8