Merge remote-tracking branch 'aosp/upstream-main' into main

Also revert 2b997bb4,which deleted libkms, as there is a libkms
dependency in aosp.

Change-Id: Ibc1580556feab23a9c309ea9380bac569537e3a2