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

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



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