Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afd

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



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