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

* commit '0fcfae88f2737b004cae83a77d590046e2b08ef3':
  Frameworks/base: Use ArraySet more explicitly