Merge "Permission protect GridOptionsProvider" into ub-launcher3-rvc-dev am: b1eeeafa6f

Change-Id: Ic35a2a16315ba8fb736ed42689076aefdd18edbe