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: I6788aa9b1592189d3e588a180a8554376fe09a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>