am 21ba889a: Merge "Ignore ro.adb.secure in user builds."

* commit '21ba889aded6167859c88f51dec54838b8e407a1':
  Ignore ro.adb.secure in user builds.