Merge "Keep custom keep-clear Rects if preferKeepClear is set" into tm-dev am: e8671271 am: 44edb5fa

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

Change-Id: Ibeed31ecb9aaab740c24ecee72456ee56fb03468