[automerger skipped] Merge "Let DreamActivity handle all configuration...

[automerger skipped] Merge "Let DreamActivity handle all configuration changes" am: e1d3b5d0 -s ours am: 738e9146 -s ours

am skip reason: Merged-In I345eb1d17ae88d893789dfcc160b4a9a664ba57f with SHA-1 bef02552 is already in history

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



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