Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
am: c2ca422b48
am: 0fa0d3be58
Change-Id: I782250c942c526e28d5048eb58f7744001a88d0b
This commit is contained in: