TRDS some tweaks and fixes

this is a part of:
https://github.com/SlimRoms/frameworks_base/commit/927b9ed90c67da92932d7552b9d458e8d4c7afca

Change-Id: Ib7b38a0ac685212881997cc132978f75a9b94abf