Merge changes I7a017026,I76a5c940 into main am: 520d7c6758 am: 3be22c2063

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

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