Merge "KeyCharacteristics implement Parcelable interface"
am: 386ee11839

Change-Id: I86dd59e2f73dad3eb7311f6e3a2db2818403c3e1