[automerger skipped] Merge "Merge "Removes unused code from the...

[automerger skipped] Merge "Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev am: 7983bfb3 am: 63af175c" into qt-r1-dev-plus-aosp
am: ef32ad45 -s ours
am skip reason: change_id I570037866d1ae90794c711622e6045ebbffa5b9c with SHA1 fcd68fd7 is in history

Change-Id: I451dd9ec20df2289f260852137f324ab14382aeb