9326f2227c
Bug: 62272543 Test: Tested with calculator and facebook messenger launch Change-Id: Ide4e844e54428edcb7e3356cb3d0492392f6bde3 (cherry picked from commit fb9272c637f4b657d40057145e4dbce989005e67)