Merge "Fix unfreeze on unstarted freezer" into sc-v2-dev am: c8ce41fa89 am: 98032e9cb8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899141

Change-Id: I51a5579bdd9c3b047c87c786698aaf0f6c8d6196