Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
am: 5973d32c77

Change-Id: I66747a250e7461cfc3fe04fb8228bb7fe7541b5a