Merge "Fix exit transition from "Additional permissions"" into sc-dev am: fd862b6b58 am: ac5f487d2a

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

Change-Id: I01634b58a25b4d3cb0daec19871d515785e9d059