Merge "Add override orientation to activity proto for CTS." into udc-dev