Merge "Move system SDK versions to system manifest" am: 1a60691cf7

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1326934

Change-Id: I6b085a7d9b3ba838ee753bd5ef0fac91dcb1837b