Merge "Properly handle unsetting of override" into main am: 24698eaa79

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2657256

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