am 7f95a1bc: am 5eb42122: Merge "Frameworks/base: Force long computation"

* commit '7f95a1bc3271318d7f08f19426be24b17186f9f0':
  Frameworks/base: Force long computation