Merge "Revert "Add new isWakeLockLevelSupportedWithDisplayId"" into main