am 33f713d2: am a60057c0: am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev
am 33f713d2: am a60057c0: am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev

* commit '33f713d2b3663ac05d145a0d971b009d9e0988a7':
  Limit RemoteControlClient generation ID changes

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base