[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert split bucket app...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert split bucket app upgrade default to true" into android11-tests-dev am: 60de9363 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1e0e6c9e1434a998f4d4b8f0a1c6de66b8e2c760