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

Bug: 126125118
Change-Id: Ifeafc16bc4f434aa86b015b4bbedceee14dc334f
tree: 197126e59370b34d539733f2df547c8f9d67878d
  1. java/
  2. tests/
  3. Android.bp