Merge changes I243417e1,I2a40fe87

* changes:
  Convert KeyChain robotests to Android.bp
  Use tip-of-tree robolectric
tree: 5ef9b3e8cc96be80b6bb3c2f410625232f37e87a
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. robotests/
  6. src/
  7. support/
  8. tests/