[automerger skipped] Merge "Do not use hidden rethrowAsRuntimeException API"...
[automerger skipped] Merge "Do not use hidden rethrowAsRuntimeException API" am: c626b864 am: 71e4b6f4 -s ours
am skip reason: Change-Id Idcb007465096f5b139585c7eb0f307fd40edac7f with SHA-1 8ad94797 is in history
Change-Id: I40a31f2496daa9816ff9cf6621e3a77d71e2d14f