Merge "Merge cherrypicks of [2159510, 2159504] into androidx-appcompat-release." into androidx-appcompat-release