Merge "Override SCREEN_ORIENTATION_LOCKED to portrait" into udc-qpr-dev am: ac6c983f08 am: 7f8b72d157

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

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