Merge "Refine clearsCompatInsets" into udc-qpr-dev am: 7f052ad338 am: 2cb118e570

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

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