[automerger skipped] Revert^2 [Mobile] Make sure we +1 the reported level if...

[automerger skipped] Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true am: caa2b71e -s ours

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

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



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