am 51ff575d: Merge "Fix issue #7649720: ANR occur when OTA with lower version..."

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '51ff575d1bd0337a68ae173ee699ff8298ddb703':
  Fix issue #7649720: ANR occur when OTA with lower version...