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: I9edcca5f9b66c4ee14f02a441956bd6db02a4e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>