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

Merge "Fix bucket change issues." into tm-dev am: 5a2d6f72 am: 249c469b am: 08ea039e am: 261b5e61

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



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