Merge "Remove home snapshot immediately" into rvc-qpr-dev am: e06c33bce3 am: 4e51140b48

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

Change-Id: Ib6cd1e2ef68994b37a2ef71290979fba67c03ca3