Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev am: 73c93f02f7
am: 392a9b5c1d

Change-Id: Ifeb044d767b03c799fa028e6efc967b88fae7b53