[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: feefe36e -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: I7f532d7ee01954bc7676d219216e259a15f7a5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>