am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"

* commit 'ecc20aafa6f3d272292e7b3577c99f2c127e590f':
  Frameworks/base: Use ArraySet more explicitly