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

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



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