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

Change-Id: Id737024481023f36253a77868e849aeaf99534b2