Merge "Persist the launcher keep clear area." into tm-qpr-dev am: edf1ca06b3

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

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