Merge "Clean up T&C implementation" am: 27f44dc792 am: 23cce86e06 am: d9dc2f3a51

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35f732fbfa73d8b207c0e1b22595d2fd0135152c
tree: 51f97743e9d781da7a2cfb51b2647a9cd444ee95
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS