Merge "Respect the absence of FLAG_ROTATES_WITH_CONTENT." into udc-qpr-dev am: 46f4a0057f

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

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