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: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]]
Former-commit-id: ed77d56a84
Former-commit-id: 1f8c88490a [formerly f681c1304c] [formerly 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]]
Former-commit-id: c5ee37a2251945312e76e97b444e5dc6495a440a [formerly b8b98a78c3]
Former-commit-id: a7b239f9c1