[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 797c23cd65  -s ours am: ac9374d893  -s ours
am: d9628c0bfc  -s ours

Change-Id: I7ae746998d82b186a8edf7b64f43853ed979a2aa
tree: 7d964c368b9ed60ecab79517f7838a62a4289ee4
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle