Merge "Clean up extra app info." into tm-dev am: bd26c3c7 am: fceaaa80 am: fa6ecc78

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



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