Merge "Clean up T&C implementation" am: 1b3cd84d1c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
tree: 3c25689d92f9442e9a900c626d1231ee9e0afe59
  1. framework/
  2. service/
  3. OWNERS