Merge "Check userspace snapshots only for API level >= T" am: ff3fdf36ef am: 0cbf9cee6f am: 1d4ebb0b46 am: f46376f356 am: 4c6cd2e470

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2145879

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