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

Merge "Fix bucket change issues." into tm-dev am: 5a2d6f72 am: 9152d1a0 am: 0f058d80 am: 9fdee66a

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



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