Merge "Merge "Remove AgingHelper code" into qt-dev am: fbc908ab86 am: 8ce3f3fa4b" into qt-r1-dev-plus-aosp
am: 02499d3187

Change-Id: I5a0f75bc78cb121a3af29d24102db7c0e5a201cf