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

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

Change-Id: I75b6280aac3f48d75f398d100d14365a7cd56408