Merge "Fix ManageStoragePreferenceController always consume click event" into...

Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1e am: f94760e7 am: 4eafad5f

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



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