Merge "Fix scrolling goes under the expanded action bar" into tm-dev am: ae401d32 am: 0a74f940

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



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