Merge "Merge "update uiautomator redirects as per https://critique.corp.google.com/#review/122073355" into mnc-mr-docs am: 60acc60b1e am: c332e02c5b am: 795b70f09c am: 2d36b0c238 am: 3a741c11cb" into nyc-mr1-dev-plus-aosp