Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: I86adbb0164a2e63a523909b989f99b49bf1dfe2f
tree: 77b44f573be30ad71558da74fe9ce7a5de9b53c7
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle
  5. OWNERS