Merge "Replacing @Nullable/@NonNull with @RecentlyNullable/@RecentlyNonNull in non-android APIs"
am: 8c1b66d30e

Change-Id: Ib5452e3f4abc36ccf7019a110b1e99428e9f4d7a