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: 9ad5a51f am: ce1521c3

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



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