[automerger skipped] Merge "liblp: Force 10.0 metadata on downgrade to Q." am: 3d882d05 am: 95c78ad7 -s ours

am skip reason: Change-Id I8b548c8ce36a75197e7172a77f9207fd44fe4670 with SHA-1 ba5dfd76 is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1355806

Change-Id: I0d580ac04f214dda8fab8943fc34d0c40947c29b