[automerger skipped] Merge "Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true" into 24D1-dev am: 8ff457cd16 -s ours

am skip reason: Merged-In I450a583974986931c5442bfec5a82bcfdb43559f with SHA-1 5166fa4c7f is already in history

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

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