[automerger skipped] Merge "Move system SDK versions to system manifest" am: 1a60691cf7 am: 05d2735592 -s ours

am skip reason: Change-Id I651622d021a76175edfd97a08c6780a521230b17 with SHA-1 1fd1de9c7a is in history

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

Change-Id: Ide30ec2d53f23e0d716310e63a5b693d4292243f