[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 4b102ac29a -s ours am: 963dc635e3 am: 501e6ff307

Change-Id: I2646608f1ca88a3a7fb66b7cc4e418c086247309
tree: b457f2f7a2f422a0dc91bcedc9ae6799862d319e
  1. disaster_recovery/
  2. libflags/
  3. .clang-format
  4. Android.bp
  5. OWNERS
  6. PREUPLOAD.cfg