Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369 am: 8c95814002

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: I1b26f25b55ad274fbdd8b39ef4209bda01e76b1e