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

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

Change-Id: I55eff71dcdd37b0bd83278727e665426d20db435