Merge "Remove old unused transaction codes." into stage-aosp-master am: e44ece16aa am: e268937b36
am: 9a31a49565

Change-Id: If39ee205e26566204e1f7054185eee4a03787f94