Merge "Migrate frameworks/base/core/tests/overlaytests/host/test-apps/UpdateOverlay to androidx.test"