Merge "Redirect for AS error message regarding SDK license agreements am: 5fb0843a am: fc329098 am: 79cb94b8 am: 9d5009e7" into nyc-mr1-dev-plus-aosp