Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: 2607015861" into nyc-mr2-dev-plus-aosp
am: ca9a29f158

Change-Id: I41ab98fe1029900b25cf2454d4e1a1232f74fe60