Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c am: de1481d6

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



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