Merge "Clean up T&C implementation" am: 1b3cd84d1c am: 6a810afd15 am: 064b340c56

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35f732fbfa73d8b207c0e1b22595d2fd0135152c
tree: e3063d5e8178ad559442923a38d5e8af6146a44f
  1. framework/
  2. service/
  3. OWNERS