Switch from androidx to android. am: ba685c0be0
am: 3a7caf1f13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987397 Change-Id: Iccb0740d39a3dc74f8fa0fae9c63a0f8a05f0de4
This commit is contained in: