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

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



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