Merge changes from topic "app_hibernation_permission" am: 4dfa5f8db4 am: c4d1d01adf

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

Change-Id: Ie6ee5b0f52492f3a87f50b84e9096eeb80b0a4f3