Merge "Clean up T&C implementation" am: e22fe5dd7d am: 9c43607801

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3be4ea39f03e9d9c8a398acba2269a0d7c3feb68