[automerger skipped] Merge "Fix cleanup of debug.vulkan.layers property" into pie-cts-dev am: 7660d99e84 -s ours am: fef1e62c50 -s ours
am skip reason: Change-Id I65f314f144c1ba4dcf8d6dd749c4b76fb4b90c1c with SHA-1 346db161d9 is in history

Change-Id: I16d30b20d0dc434cd7b307ae20f0292a206a7796