Merge "Merge "Fix return value in View#getUnrestrictedPreferKeepClearRects"...

Merge "Merge "Fix return value in View#getUnrestrictedPreferKeepClearRects" into tm-dev am: 32667b28 am: 0a574afe" into tm-qpr-dev am: f4246c57

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



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