Merge "Persist the launcher keep clear area." into tm-qpr-dev am: edf1ca06 am: d4c5eac3 am: c1dfe6f6 am: 6479cf5c

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



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