LTS Refresh: Merge upto ed2592bef15e8309dc47eb5c70ff090451155640 (buildnumber: 13310.1498.0) from main-R85-13310.B-cos-5.4 to release-R85-13310.B-cos-5.4.

BUG=b/238366064
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R85-13310.B-cos-5.4 to release-R85-13310.B-cos-5.4

Signed-off-by: He Gao <hegao@google.com>
Change-Id: I3e18e2b80233c93d307a280ce55bc891e36e17a8