[automerger skipped] Merge "Respect the absence of FLAG_ROTATES_WITH_CONTENT."...

[automerger skipped] Merge "Respect the absence of FLAG_ROTATES_WITH_CONTENT." into udc-qpr-dev am: 46f4a005 am: 83466fc9 -s ours

am skip reason: Merged-In Ie12d5e93626ebc298ab71e8634e4e50bb70d49da with SHA-1 19c59050 is already in history

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



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