Merge "Fix gmail flicker issue in split screen" into tm-qpr-dev am: f3e2db05 am: fd0c8775

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



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