Merge "Partial revert "Update appcompat prebuilts to build 7207786."" am: 1f25c503f9

Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1644907

Change-Id: I4002092f9c41ba6ed2cbec29528591ca78c676d1