Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb

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



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