am "am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
ae4456c am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev