Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"

This reverts commit 1745f3a7592fae9f572027f46df6441e61dc2bf5.

Reason for revert:
1. The BUILD_VERSIONS.S is 1000, and thus it will prevent
   the code from requiring new algorithms on devices whose
   first sdk is 31 (e.g. cuttlefish), though these devices
   should be treated as first launched with SDK S.
2. It will break #testValidationForAlgosAddedInS, because
   the test code is using BUILD_VERSIONS.R to gate the test,
   which is inconsistent with the implementation.

Bug: 181887451
Test: atest IpSecAlgorithmTest
Change-Id: I5cd717c5ebd6086ae5cf9abf76311ae4fca0c6e9
1 file changed
tree: a4ce994dc3115742eec4e5c825516b3f1fd86d62
  1. core/
  2. services/