Merge "Add a bounds check when getting indexed items in dexlayout. am: 9a7f386ef0 am: 2744c76048" into oc-dr1-dev-plus-aosp