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

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

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