Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28
am: aee4b8e3d4
am: 2a742b1774
am: 8325e40813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164 Change-Id: I3023898eb2e61a11b8c48a680522b3196d1757fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: