[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c am: 80b3bb5141 -s ours am: cfe7584cec -s ours am: db42e97e81 -s ours am: f9573a79cd -s ours am: 0ed11daae3 -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: I5b2d7c31ad82185d30e2acf38e6eb0b2659c4b63
This commit is contained in: