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: c0b0cb88 am: ccdd421d am: 10e10086

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



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