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: f7e40faa

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



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