Merge "Add override orientation to activity proto for CTS." into udc-dev am: 4e97beca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22302742



Change-Id: I88b493dcc83d08a0e1f2938333582390a137430c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>