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

Change-Id: I5aec19e8a7b6e098831c68bb86c48b39c1ad0a7b