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

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

Change-Id: Ie99e5fb84fb16f4f94a6aff0f072b6c716880e5e