Merge "Disable ARC when physical address is incorrect" am: 27cdbf8a25 am: 1eca3d7321 am: 2c31fa42cb

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

Change-Id: I16a0a0f4731221df786a17311e713f71a2a0bd9f