Merge "FRP: disable credential FRP on dragon" into oc-mr1-dev
am: e27ca39f57

Change-Id: I9407b0b3eae282663ef88c15176a8e3206f17824