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

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

Change-Id: I466de1642cb4c23d9a6a16d7f1622f2db75a63fa