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

Change-Id: I8dd477c65898f92954868d5ab25b12ffabfe3d0a