Merge cherrypicks of [3571644, 3571645, 3571646, 3572287, 3571905] into pi-release

Change-Id: I50994b4a0496251842176de29ebd744f6ae9e50b
tree: 37da48340d00b6072872edb7301e9b03a8ce2e7d
  1. android/
  2. androidx/
  3. com/
  4. Android.mk
  5. NOTICE.txt
  6. source.properties