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

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



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