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

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

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