Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 57223d7b72

Original change: https://android-review.googlesource.com/c/platform/frameworks/ml/+/1430833

Change-Id: I35bc9bb3e6883b269d0fb7cdbb1a6749c825a454