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

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



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