Merge "set ro.adb.secure=1 for user builds" am: f9911ae087
am: 45407b471e

* commit '45407b471ef831fc10e79fc1f9ea5a6c8d838387':
  set ro.adb.secure=1 for user builds