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

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