Merge "Add hibernation NPE check and unhibernate only if hibernating" into sc-v2-dev am: fdd7b1a075

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

Change-Id: I86abe904a35ba229ec3047619563b0827c55815f