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

Change-Id: Iadad1aaf07aef5d4ec715ffb78258d730778e1c6