Merge "Use FeatureProvider to provide the firmware update category." into...

Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a

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



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