Merge "Merge "Set untrusted bit when create WIfiConfig" into rvc-dev am: 69540df3 am: 7026ae80" into rvc-d1-dev-plus-aosp