Merge "Remove title of Smart Lock / Trust Agents preference category" into...

Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev am: 4dcf0565 am: fa6ae077

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



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