Merge "[Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true" into main