Merge "Fix the problem that mDamageGenerationId is a random value" into main am: 7165268319 am: 6f85a7a688

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2921305

Change-Id: I9eca6dd2e750edd96bcad080fe5838441f70c3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>