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

* commit '63ab6eb220a2a75837d6e3d18d19cbd5dda175eb':
  Frameworks/base: Use ArraySet more explicitly