Merge "Only clear bounds and windowing mode for standard" into tm-qpr-dev am: 70a463df

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



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