Merge "Merge "Add String16#contains and strstr16 methods." into nyc-dev am: 8b452b876b am: 3fe4a71e5f" into nyc-mr1-dev-plus-aosp