Merge cherrypicks of ['googleplex-android-review.googlesource.com/21076509', 'googleplex-android-review.googlesource.com/21162824'] into tm-qpr2-release.

Change-Id: I0ac249f67a935142932d6632acb18d7c2cdecd6e
tree: d6518d920152e3841f976e915b445aa997f5142f
  1. intf/
  2. pn8x/
  3. snxxx/
  4. .clang-format
  5. Android.bp
  6. METADATA
  7. OWNERS
  8. PREUPLOAD.cfg