Merge "Update the categorize rule for system and app item bucket" into tm-dev am: b0151d11 am: e0ef4223

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

Change-Id: I5d3e7b06a9a1ef006ed4d33db7396600938e1d9e