Merge "simpleperf: Update DisplayBitmaps test apks." am: 5864ee0362

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1855874

Change-Id: I828c09daf3d7e4169dc978ca8ddd7313a71d6e87