Merge "Don't change bucketing reason if app is already in better bucket." into...

Merge "Don't change bucketing reason if app is already in better bucket." into tm-dev am: 7950f77e am: a4225a22 am: f2af8619 am: a91e35e6

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



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