Merge "Fix back button in "Unused apps" page not working" into sc-dev am: 0426a9ac61 am: 253338f5dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14735903

Change-Id: I5bac4eb1fea0cea66225b3ed297530ea3168a2c6