Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: Ia21dab25c17bb56c49bdbd239b7b72bf28e226f7
Change-Id: I9e2715474fd8db42817790716da4deef3462757f
tree: 033a2ea54f61c1238a5e634fdcc6ee9b4c81fc3a
  1. library/
  2. OWNERS
  3. PREUPLOAD.cfg