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

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

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



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