Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e10 am: 6fdf6b29

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

Change-Id: I8626de876860f09c7794872106e280ee5bb60272