Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83

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

Change-Id: I1e70974396efc1eaf4e389cc35a2789849e696af