Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6 Former-commit-id: fa693a9bb802af2491c70c14aa7ab33485fb4915