Merge "Fix bucket change issues." into tm-dev am: 5a2d6f72

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



Change-Id: Ic5d9dd3d479030ff474b52e720d6f1bf9b0c2eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>