[automerger skipped] Merge "Fix not on the top when entering device detail...

[automerger skipped] Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac17121 am: b161bade -s ours

am skip reason: Merged-In Ic0be940c8466b5e1e301255868c29d06bd4428bd with SHA-1 cfec0923 is already in history

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



Change-Id: I167132c5bd4fc2d6ec7af7575f05e18a704a57c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>