Merge "Remove keep clear areas when a view detaches" into tm-dev am: 769b3a43 am: 3b1e1441

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

Change-Id: I23b77091868fb42a7d0d7b142e336915e2a5c584