Merge "Align the size calculation of task configuration" into tm-qpr-dev am:...

Merge "Align the size calculation of task configuration" into tm-qpr-dev am: e7b17199 am: a740bbf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18400688



Change-Id: I4b767f43798c211b7ef55f348b78cdf69e4fbd47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>