Merge changes from topic "app_hibernation_permission" am: 4dfa5f8db4

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

Change-Id: I55b8dc7dfa171b5d11098320445932ef2f91bcbf