Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: 1ab73ef6e8 am: 697ced2aab

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

Change-Id: Ibb631b37c2d1bf3e8dadda8e703d33a58a7e6495