am b55ce801: am 4c733ef8: Merge "camera2: Remove obsolete CameraCharacteristicsTest" into lmp-dev

* commit 'b55ce801c3c57e74307d4bc41ba8d95fe333259d':
  camera2: Remove obsolete CameraCharacteristicsTest