Android mainline 11.0.0 release 40
Merge remote-tracking branch 'goog/rvc-dev-plus-aosp' into mm

Bug: http://b/150808858
Change-Id: Iee3a0cdddfc11720738b141bacf18a181adb41f2