[automerger skipped] Merge "Reclassify FGS and BOUND_TOP as "background" in...

[automerger skipped] Merge "Reclassify FGS and BOUND_TOP as "background" in BatteryUsageStats" into tm-qpr-dev am: f38ff6c1 am: 06f25f1d -s ours

am skip reason: Merged-In Ice58ea7537847441f41ed97c5f8b2bda2b4b7e4d with SHA-1 758ad303 is already in history

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



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