[automerger skipped] Add orientation per-app controls. am: fdcb4c9fd4 am: 6ce4ea8b43 -s ours

am skip reason: Merged-In I6d83170632a04e3d60461f37f13acc1de5b6a6cb with SHA-1 d0f6fc69a7 is already in history

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

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