platform/development - S is now 31 am: bf3ac3461f

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14744975

Change-Id: I905f0505daf28ca42824e0b8ce517b98c12ed93e