Merge "Handle versions of the form -a.b.c+foo." am: 75fa9a110d

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

Change-Id: Iee313709147eeb6856eea4627e51c2e04b6c216c