[automerger skipped] Merge "Deprecated the resource config_tether_apndata" am: a97f8b3998 am: bbcc1ae0f5
am: cea554b185  -s ours

Change-Id: I31c81565686097139bc69a2a4f6446ad6df36d23