[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: I012950d0a764a1655ca06e89dd9e98962f386a17
This commit is contained in: