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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
tree: 0cd1001bdb415c4feef1e9a2d44e593057a8a87b
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS