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

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



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