Merge "Fix the expected tagged_addr_ctrl in a test." am: 485505c06d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1484250

Change-Id: I252838ef872fed929fc17bed8be4f26dcdfac826