[automerger skipped] Merge "Add hibernation NPE check and unhibernate only if...

[automerger skipped] Merge "Add hibernation NPE check and unhibernate only if hibernating" into sc-v2-dev am: fdd7b1a0 am: 4b12d4a0 -s ours

am skip reason: Merged-In Ia45d0c9236474841d0ba63b5265b3b835cf9f6f5 with SHA-1 2e8b4013 is already in history

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

Change-Id: I627f8c8a36ca7a5cbb7ae325ae48cdf6d803d60b