am "am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
a48b550 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev