Merge "Fix the transition of the up-button." into sc-dev am: 20fa1428bc am: 94fb328182

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432390

Change-Id: I6d55e6e359148815b3d3221ef2acaff3724f5c34