Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac17121

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



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