Merge "TaskId=0 is also a valid task id, should not be passed to valueIfKeyNotFound." into main am: c93563c1c1 am: 868b1dd8a5

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

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