Merge changes from topic "change_period" am: c0de6d81 am: 3d81e0ba am: aa259e7e

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2043104



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