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

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

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



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