Merge "Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029 am: 5250d90637 am: 49e3ce4800" into nyc-mr2-dev-plus-aosp