Have back-compat shim actually return the value
Bug: T94958 Change-Id: I75fbd11c8bb357b83079402592e8863acef18fb1