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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b7d1eff6a9a97cbee2e587e553e0a0fb98b45d5