Merge changes from topic "vabc-user-snapshots" am: 04eecd44 am: f3b98f4c...

Merge changes from topic "vabc-user-snapshots" am: 04eecd44 am: f3b98f4c am: 6413fea1 am: 033f5966

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

Change-Id: I367553b19935139a993f3c30d69e092d1f7521eb